Skip to content

Rollup of 8 pull requests #140122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Apr 21, 2025
Merged

Rollup of 8 pull requests #140122

merged 18 commits into from
Apr 21, 2025

Conversation

ChrisDenton
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

mumbleskates and others added 18 commits April 16, 2025 18:53
… r=jhpratt

fix missing word in comment

a very simple fix, rectifying a situation in which a word was accidentally .
…ratt

SystemTime doc tweaks

* Change the `UNIX_EPOCH` link in the `SystemTime` docs to point to the associated constant, not the module level constant. The former seems to be the recommended way to access it, since aiui the only reason the module constant exists in the first place is that associated constants weren't stable yet at the time.
* Reword the comment in the `SystemTime` example - "an error occurred!" is a tad misleading; I feel like it implies a system error out of our control while `SystemTimeError` is more of a logic error.

I was originally just gonna do the first thing but I noticed the second and figured I may as well.

I'm also somewhat surprised that there aren't more in-depth module level docs for `std::time`; they don't even mention `SystemTime` at all. I might make another PR for that but mainly just wanted to flag it.
docs(LocalKey<T>): clarify that T's Drop shouldn't panic

Clarify that should a TLS destructor panics, the process will abort.

Also, an abort may be obfuscated as the process can be terminated with `SIGSEGV` or [`STATUS_STACK_BUFFER_OVERRUN`](https://devblogs.microsoft.com/oldnewthing/20190108-00/?p=100655) (i.e., `SIGABRT` is not guaranteed), so explicitly prints that the process was aborted.

Context:
https://users.rust-lang.org/t/status-stack-buffer-overrun-on-windows-without-any-usage-of-unsafe/128417

``@rustbot`` label -T-compiler
…r=lcnr

Don't ICE on pending obligations from deep normalization in a loop

See the comment I left inline in `compiler/rustc_trait_selection/src/traits/normalize.rs`.

Fixes rust-lang#133868

r? lcnr
Relocate tests in `tests/ui`

Part of rust-lang#133895

Moved tests from a top-level directory into a more appropriate subdirectory.
If there is anything else that could be improved, please let me know!

r? jieyouxu
…eyouxu

Use `output_base_dir` for `mir_dump_dir`

It just occurred to me that the problem might be due to multiple revisions using the same dump directory (and therefore deleting the other revision's dir). This fixes that by simply using the normal per-test output directory, which is revision safe.
…youxu

Document why CodeStats::type_sizes is public

As indicated in [this comment](rust-lang#139876 (comment)) from rust-lang#139876
> Need some comment, otherwise this pub can be eventually removed as unused.

r? `@nnethercote`
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 21, 2025
@ChrisDenton
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Apr 21, 2025

📌 Commit 77325f5 has been approved by ChrisDenton

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 21, 2025
@bors
Copy link
Collaborator

bors commented Apr 21, 2025

⌛ Testing commit 77325f5 with merge 8f2819b...

@bors
Copy link
Collaborator

bors commented Apr 21, 2025

☀️ Test successful - checks-actions
Approved by: ChrisDenton
Pushing 8f2819b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 21, 2025
@bors bors merged commit 8f2819b into rust-lang:master Apr 21, 2025
7 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 21, 2025
@ChrisDenton ChrisDenton deleted the rollup-qsj6xu0 branch April 21, 2025 19:28
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#139946 fix missing word in comment 3acaa8831d7b7dab6f07ab63f1ce1bc24e0ade39 (link)
#139982 SystemTime doc tweaks 537d019997ec3b47cf6bcbc077e68a4a3437d09b (link)
#140009 docs(LocalKey): clarify that T's Drop shouldn't panic 396e92a14d3c48b0b886cdde90d1626fd89c0fe4 (link)
#140021 Don't ICE on pending obligations from deep normalization in… 273cfcf003f2638361234c48f11396eade13337e (link)
#140029 Relocate tests in tests/ui 2a6dc6a54edff011f3eef4d42b7fec7fa6c30441 (link)
#140030 Fix autodiff debug builds fcaa631b10f463aabf00d11cd94db8d53249ce94 (link)
#140120 Use output_base_dir for mir_dump_dir e190185e6541b44c90bdc4cd8783169e36f0b44a (link)
#140121 Document why CodeStats::type_sizes is public c842d533cdeaeea481a40a22920c9f54112ae8e8 (link)

previous master: c8f9423028

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

Copy link

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing c8f9423 (parent) -> 8f2819b (this PR)

Test differences

Show 128 test diffs

Stage 1

  • [crashes] tests/crashes/133868.rs: pass -> [missing] (J1)
  • [ui] tests/ui/borrowck/writing-to-immutable-vec.rs: [missing] -> pass (J1)
  • [ui] tests/ui/deref-non-pointer.rs: pass -> [missing] (J1)
  • [ui] tests/ui/deref-patterns/deref-non-pointer.rs: [missing] -> pass (J1)
  • [ui] tests/ui/lazy-and-or.rs: pass -> [missing] (J1)
  • [ui] tests/ui/list.rs: pass -> [missing] (J1)
  • [ui] tests/ui/minus-string.rs: pass -> [missing] (J1)
  • [ui] tests/ui/or-patterns/lazy-and-or.rs: [missing] -> pass (J1)
  • [ui] tests/ui/recursion/recursive-enum-box.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/deep-norm-pending.rs: [missing] -> pass (J1)
  • [ui] tests/ui/typeck/minus-string.rs: [missing] -> pass (J1)
  • [ui] tests/ui/writing-to-immutable-vec.rs: pass -> [missing] (J1)

Stage 2

  • [ui] tests/ui/borrowck/writing-to-immutable-vec.rs: [missing] -> pass (J0)
  • [ui] tests/ui/deref-non-pointer.rs: pass -> [missing] (J0)
  • [ui] tests/ui/deref-patterns/deref-non-pointer.rs: [missing] -> pass (J0)
  • [ui] tests/ui/lazy-and-or.rs: pass -> [missing] (J0)
  • [ui] tests/ui/list.rs: pass -> [missing] (J0)
  • [ui] tests/ui/minus-string.rs: pass -> [missing] (J0)
  • [ui] tests/ui/or-patterns/lazy-and-or.rs: [missing] -> pass (J0)
  • [ui] tests/ui/recursion/recursive-enum-box.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/deep-norm-pending.rs: [missing] -> pass (J0)
  • [ui] tests/ui/typeck/minus-string.rs: [missing] -> pass (J0)
  • [ui] tests/ui/writing-to-immutable-vec.rs: pass -> [missing] (J0)
  • [crashes] tests/crashes/133868.rs: pass -> [missing] (J2)

Additionally, 104 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 8f2819b0e3428d0aee05fa60e91e0211c2aea053 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. dist-x86_64-apple: 10601.1s -> 9313.0s (-12.2%)
  2. x86_64-apple-1: 8568.2s -> 7989.6s (-6.8%)
  3. dist-loongarch64-linux: 6725.3s -> 6302.3s (-6.3%)
  4. aarch64-apple: 3722.3s -> 3938.8s (5.8%)
  5. x86_64-msvc-1: 9040.3s -> 8604.9s (-4.8%)
  6. x86_64-rust-for-linux: 2615.0s -> 2732.8s (4.5%)
  7. x86_64-gnu-tools: 5900.2s -> 6159.1s (4.4%)
  8. x86_64-gnu-llvm-19-1: 5337.4s -> 5108.5s (-4.3%)
  9. x86_64-mingw-2: 7137.7s -> 6832.9s (-4.3%)
  10. dist-x86_64-mingw: 7922.0s -> 7609.6s (-3.9%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8f2819b): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.2% [0.2%, 0.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -0.1%, secondary -0.1%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
1.9% [0.5%, 3.8%] 4
Regressions ❌
(secondary)
3.2% [1.5%, 5.5%] 6
Improvements ✅
(primary)
-1.4% [-3.4%, -0.6%] 6
Improvements ✅
(secondary)
-5.1% [-8.1%, -2.2%] 4
All ❌✅ (primary) -0.1% [-3.4%, 3.8%] 10

Cycles

Results (primary -0.6%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.6% [-0.7%, -0.5%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.6% [-0.7%, -0.5%] 2

Binary size

Results (primary 0.0%, secondary 0.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.0% [0.0%, 0.0%] 4
Regressions ❌
(secondary)
0.0% [0.0%, 0.0%] 29
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.0% [0.0%, 0.0%] 4

Bootstrap: 774.633s -> 775.846s (0.16%)
Artifact size: 365.03 MiB -> 365.03 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.